cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,337 Commits 10 Branches 0 Tags
cddbc6e9765ba8c350a38df63009a444136e48de
Commit Graph

15279 Commits

Author SHA1 Message Date
Anewbe
cddbc6e976 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into radio_freqs 2017-03-28 14:28:15 -05:00
Anewbe
b5696a9c6f Merge pull request #3155 from Schnayy/flower_crowns2 
Flower crowns with fixed conflict? Maybe? Please?
 2017-03-27 23:32:47 -05:00
Anewbe
6e7aa75835 Merge pull request #3141 from VOREStation/shuttlebetter 
Dynamic Shuttle Walls/Landings
 2017-03-27 23:26:35 -05:00
Schnayy
0f98eedab4 Fixed indentation 2017-03-27 17:16:06 -05:00
Neerti
d2078e86d6 Merge pull request #3149 from Anewbe/jackets 
Reworks how some jackets open
 2017-03-27 16:44:43 -04:00
Schnayy
971eb97399 Fixed conflict? Maybe? Please? 2017-03-27 00:42:39 -05:00
Anewbe
d665a0dee2 Makes translators more expensive 2017-03-26 17:36:36 -05:00
Neerti
565fea9648 Merge pull request #3144 from Anewbe/uniforms 
Makes space in the uniforms.dmi file
 2017-03-26 18:14:06 -04:00
Anewbe
9fedcf7d1e Merge pull request #3145 from Cerebulon/medical_handsprites 
Added hand sprites to most medical items.
 2017-03-26 17:06:10 -05:00
Anewbe
2e5e77997a Reworks how some jackets open 2017-03-26 16:58:27 -05:00
Anewbe
22ae87c376 Fixes a bug with meatbrain FBPs. 2017-03-26 16:34:47 -05:00
Anewbe
511f8ce708 Fixed the things 2017-03-26 11:44:50 -05:00
Cerebulon
3c17d1b33f Added in-hand sprites to most item lacking them from the Medical department. 
(Full list: Body bag, Advanced Mass Spectrometer, Rescue Suit Control Module, Stethoscope, Stasis bag, Defibrillator, Blood Packs, Advanced Trauma/Burn Kits, Hypospray, Biopsy Scanner, Surgical Drill, Fixovein, Retractor, Bone-Gel, Bone Setter, Cautery, Hemostat, Inflatable Wall Box.
 2017-03-26 07:04:01 +01:00
Anewbe
6b0500dd27 Makes space in the uniforms.dmi file 2017-03-26 00:59:14 -05:00
Arokha Sieyes
1300ef333d Dynamic Shuttles - Code and Icon Changes 2017-03-25 21:00:08 -04:00
Neerti
629a044761 Merge pull request #3137 from Anewbe/robot_skintone 
Adds skintone to FBPs
 2017-03-25 20:57:01 -04:00
Schnayy
ade40d627e Added 3 clothing sprites w/ appropriate ground/held sprites. (#3134) 
* Added 3 clothing sprites w/ appropriate ground/held sprites.

1, white yoga pants, intended to be any color.

2, white kimono, intended to be any color.

3, red and black jacket.

All intended to be in the loadout.

* Put coding in. Jacket has pockets, same cold resistance as a hoodie. Kimono and yoga pants have color selectors. All are in the loadout.

* Removed cold protection from jacket & fixed missing mob sprites. Don't know what happened with the latter, was definitely there when I tested it.
 2017-03-25 17:44:04 -05:00
Schnayy
8bb5924481 Adds greyscale sprites for heels worn/held/on the ground. (#3133) 
* Adds greyscale sprites for heels worn/held/on the ground. Still needs coding. First commit, hope I do it right!

* Fixed capitalization, added coding.

* Rennamed heelsheld to heels, as per anewbe's request.
 2017-03-25 16:48:39 -05:00
Anewbe
f316fd2dca Merge pull request #3136 from Belsima/master 
Updates drone respawn time.
 2017-03-25 16:37:08 -05:00
Belsima
50bc49ff86 Five minutes instead. 2017-03-25 17:29:37 -04:00
Anewbe
88b0c6086e Antag Radio changes 2017-03-25 14:19:57 -05:00
Anewbe
d90699998b Adds skintone to FBPs 2017-03-25 13:55:49 -05:00
nachomeep
9c86db2669 dron respawn time change 2017-03-25 14:37:06 -04:00
Neerti
eb73ee4b44 Merge pull request #3120 from Anewbe/alien_tweaks 
Xeno race tweaks
 2017-03-25 11:27:22 -04:00
Anewbe
14b9f7ce79 Adds bench presets 2017-03-24 22:46:43 -05:00
Anewbe
3c1d897fc4 Actually gets the HI name right 2017-03-24 15:27:55 -05:00
MagmaRam
e3a87c1c78 Merge pull request #2985 from Anewbe/more_pdas 
Adds rugged style PDAs
 2017-03-22 19:42:19 -05:00
MagmaRam
d603394226 Merge pull request #3121 from Anewbe/borg_zap 
Borg stun arm should work now
 2017-03-22 19:42:01 -05:00
Anewbe
538f91c202 Borg stun arm should work now. 2017-03-22 17:06:16 -05:00
Anewbe
38598f3aae Merge pull request #3118 from Neerti/3/6/2017_surface_map 
Continues work on the surface map
 2017-03-22 16:33:40 -05:00
Arokha Sieyes
be36363a23 Ports several Paradise sound emotes (#3039) 
* Ports several Paradise sound emotes

* Comment out scream MORE.

* Remove goonsounds, references
 2017-03-22 16:11:55 -05:00
Arokha Sieyes
ae68468861 Allow AI to use custom holograms (#3114) 
* Compound icon generator proc

Why didn't this exist before? Am I missing something? I need manipulatable icons of existing atoms including their overlays. Is there some easier way to get them than this...?

* Polaris Portion of AI Upgrade
 2017-03-22 16:09:04 -05:00
Arokha Sieyes
9660186dfd Not So Simple Animals (#3103) 
* Merge two not-really conflicts

Thanks git, that whitespace conflict was super important?

* DME merge

* Added defines for mobs used by simple animals.

* Lost a slime along the way

* Disable debug settings

* HONK!!!

* Remove redundant hostile decls

* Replace loc= with forceMove in old SA code

I guess I should think of the children.
 2017-03-22 14:30:07 -05:00
Anewbe
68a335b0c5 Xeno race tweaks 2017-03-21 23:31:10 -05:00
Anewbe
560af2d61d Merge pull request #3116 from VOREStation/spawn 
Makes the 'Spawn Character' verb include custom items
 2017-03-21 18:38:23 -05:00
Anewbe
f16c6e22a7 Merge pull request #3115 from Atermonera/Emotes_don't_autohiss 
Emotes, sign language, and EAL no longer activate autohiss
 2017-03-21 18:38:04 -05:00
Neerti
b571ed9c66 Continues work on the surface map 2017-03-21 16:11:13 -04:00
Arokha Sieyes
e6098840ec Fix runtime while eating 
Don't divide by zero. If it has no flavors, this stays 0, then you try to divide by it.
 2017-03-21 13:08:08 -04:00
Arokha Sieyes
17bd2d341a Makes the 'Spawn Character' verb include custom items 
Only really works if you pick the option to put them in the mob, because the proc that spawns custom items is based on that, and I don't really want to rework the custom items system for such a small fix.
 2017-03-21 09:48:55 -04:00
Atermonera
78c1b51f81 Languages with NO_STUTTER won't use autohiss anymore 2017-03-21 00:13:33 -07:00
Neerti
7f14550a9a Merge pull request #3010 from Anewbe/cargo_heph 
Readds HI prosthetics, corrects naming
 2017-03-21 00:27:00 -04:00
Leshana
3a4bc3d897 Fix signularity_pull leaving ghost item in your inventory slot 
* It called u_equip()  Nothing should call u_equip(), bad!
* Also replaced magic numbers with defined constants while I was checking singularity code.
 2017-03-20 21:31:52 -04:00
Anewbe
4779baf872 Spelling 2017-03-20 20:14:48 -05:00
Anewbe
59a4f62668 Merge pull request #3078 from Leshana/vplk-atmos-leak 
New Event: Atmos Leak
 2017-03-19 20:22:42 -05:00
Atermonera
2d2763fdb0 Merge pull request #2 from PolarisSS13/master 
There should probably be a way to do this automagically
 2017-03-19 17:09:02 -07:00
Atermonera
530593508a Gives surgeonborgs the full medical hud, because why don't they already have it? 2017-03-19 16:58:53 -07:00
Anewbe
b5866d5876 Merge pull request #3088 from Leshana/huhbots 
Ports Bot Patrolling back to Polaris (Plus bot fixes)
 2017-03-19 16:09:32 -05:00
Neerti
24b50fe2e6 Merge pull request #3098 from Leshana/mob-controller-runtime 
Fix runtimes in controllers
 2017-03-18 22:27:13 -04:00
Neerti
80c29e6213 Merge pull request #3102 from VOREStation/ventweld 
Fixes ventcrawl
 2017-03-18 21:27:41 -04:00
Arokha Sieyes
5425a06bc8 Fixes ventcrawl 
Fixes #1202
 2017-03-18 19:30:54 -04:00