cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,241 Commits 6 Branches 0 Tags
beda3185eb00ec8dfc4460e9247ff9e92924de0e
Commit Graph

30241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Datraen
beda3185eb Reverts the second mob clean up because of incomplete implementation. 
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
 2016-05-04 00:24:55 -04:00
Datraen
fbcf5bd530 Merge pull request #1542 from Dibasic/patch-6 
Fixes preferences typo
 2016-05-03 18:48:26 -04:00
Yoshax
0a20abb6ec Updates a missed check and updates parentheses on uniforms/suits hiding shoes (#1540) 2016-05-03 22:19:25 +01:00
SinTwo
5ae20ceb8b Buildables v1.2 (#1517) 
* Removes text2path, adds constructability to a few things, adds a locker_painter.dm, and several fixes.

* Fixes Maps due to working on ancient versions.

* Path error.

* Adds a missing ..()
 2016-05-03 22:18:12 +01:00
Dibasic
538ac79d8d fixes accidental newline showing a third edited line 
just cleaning it up
 2016-05-03 14:42:00 -05:00
Dibasic
edfee3eb31 Fixes preferences typo 
fixes an extra space in the messages to toggle off ghost-ears and ambient noise.
 2016-05-03 14:40:57 -05:00
Datraen
ff06850ea1 Merge pull request #1538 from Yoshax/dress 
Allows for uniforms to hide shoes with HIDESHOES
 2016-05-02 21:59:04 -04:00
Yoshax
053851f28b Allows for uniforms to hide shoes which HIDESHOES 2016-05-03 02:10:54 +01:00
Neerti
a2e40b5354 Merge pull request #1537 from Yoshax/typofix 
Fixes a minor typo
 2016-05-02 16:04:39 -04:00
Yoshax
f3cf85e9e6 Fixes a typo 2016-05-02 20:14:45 +01:00
EmperorJon
f62eacf6e5 Merge pull request #1519 from Yoshax/smokegrenades 
Smoke grenade changes and adjustment
 2016-05-02 18:04:23 +01:00
EmperorJon
5996239657 Merge pull request #1530 from Datraen/NullSpeakCheck 
Adds a check for can_speak to prevent null language procs being called.
 2016-05-02 18:00:15 +01:00
Yoshax
6072ad758a Removes a bunch of old, unused code 2016-05-02 14:13:50 +01:00
Yoshax
5824f0a7c1 Comments out smoke reducing laser damage until there's a nice way to do it 2016-05-02 13:44:47 +01:00
Datraen
6dce14fd17 Merge pull request #1535 from Neerti/5/2/2016_runtime_fixes 
Fixes two very common runtimes
 2016-05-02 01:01:20 -04:00
Neerti
3ea6635f6a Fixes two very common runtimes 
Fixes some null.Topic() runtimes caused by AI hotkeys.
removeItem() now checks if the item actually exists before modifying variables.
 2016-05-02 00:46:31 -04:00
Neerti
c9c7cb588f Merge pull request #1533 from Yoshax/dress 
Makes newly added dresses not look terrible with shoes
 2016-05-01 22:00:17 -04:00
Yoshax
3fe70209b6 Makes newly added dresses not look terrible with shoes 2016-05-02 02:18:59 +01:00
Datraen
3baf91b46e Merge pull request #1307 from Neerti/3/30/2016_dumb_gun_balance 
Dumb Gun Balance Patch
 2016-05-01 17:42:25 -04:00
Datraen
7a92283cac Fixes an OOP issue. 2016-05-01 15:34:25 -04:00
Datraen
81b638afc5 Adds a check for can_speak to prevent a null language from being spoken. 2016-05-01 15:08:27 -04:00
Datraen
ac74e6af09 Merge pull request #1528 from Yoshax/supersnowflake 
Increase the size of a number of defines used to save records, names and books
 2016-05-01 14:34:30 -04:00
EmperorJon
23e9145223 Merge pull request #1497 from Mechoid/Cult_Ghost 
Manifest Ghost Additions
 2016-05-01 16:35:31 +01:00
EmperorJon
50ac115d68 Merge pull request #1524 from SinTwo/minimalist-ui 
Allows robots to change UI style.
 2016-05-01 16:34:28 +01:00
EmperorJon
cc7249feda Merge pull request #1525 from Woodratt/1.5.1_baggystuff 
1.5.1 Baggy Jeans and Trousers and stuff.
 2016-05-01 16:25:11 +01:00
Yoshax
6218f39ce8 Increases name and paper and book length to allow for more flexibility in various things. 2016-05-01 16:22:53 +01:00
Yoshax
5bc7eaa212 Removes stupid vars, adjusts smoke code 2016-04-30 20:04:43 +01:00
Yoshax
1e78ff97e1 Adjust smoke color selection 2016-04-30 14:29:46 +01:00
Datraen
50fbb518d3 Merge pull request #1523 from Anewbe/satchel_refactor 
Refactors specialized satchels as children of the regular (leather) satchels
 2016-04-30 08:32:11 -04:00
woodratt
320b17c37b 1.5.1 Baggy Jeans and Trousers and stuff. 
- Organized jeans and pants in the dmi.
- Small change in the white pants shading.
- Added the missing inventory icon for grey jeans.
- Fixed missing mob icon for the yellow dress.
- Added baggy variants of the pants already in game.
 2016-04-30 01:35:31 -07:00
SinTwo
cc3dca6cb1 Allows robots to change UI style. 2016-04-29 22:40:27 -04:00
Anewbe
22a9b32a29 Fixed the map thing and a few other issues. 2016-04-29 19:08:04 -05:00
EmperorJon
a02d516027 Merge pull request #1502 from Datraen/FBPFaceFixing 
Fixes* surgery steps to fix FBP faces
 2016-04-30 00:57:57 +01:00
Anewbe
7b1eb6c099 Refactors specialized satchels as children of the regular (leather) satchel 2016-04-29 18:44:28 -05:00
Yoshax
c4929aa43f Adds ability to change color of smoke of smoke grenades with a multitool 2016-04-29 20:30:31 +01:00
Yoshax
b57ea6a752 Adds colored smoke grenades and ability for them to take color 2016-04-29 17:19:08 +01:00
EmperorJon
179f736829 Merge pull request #1500 from Yoshax/dresses 
Adds some dresses
 2016-04-29 13:19:29 +01:00
EmperorJon
fb50a1d7d3 Merge pull request #1511 from Yoshax/plscompile 
Restores ability to compile on 510
 2016-04-29 13:17:03 +01:00
Yoshax
cf0a67d18f Restores ability to compile on 510 2016-04-29 01:34:20 +01:00
Datraen
25d4590d4f Merge pull request #1482 from Anewbe/devour_fix 
Fixes Taj/Unathi being unable to eat mice.
 2016-04-28 19:22:27 -04:00
Datraen
3e8c503d05 Merge pull request #1477 from Yoshax/renegades 
Adjusts renagade gun list and spawns the gun in a bag if one exists
 2016-04-28 19:20:44 -04:00
Datraen
4416d17b0a Merge pull request #1507 from Yoshax/bugfixes 
Adjusts HoS' locker capacity & moves CE's office camera
 2016-04-28 19:17:29 -04:00
Neerti
57b4c05b97 Merge pull request #1509 from Datraen/AmbitionsSantitize 
Santizes ambitions before they're set to the mind variable.
 2016-04-28 19:16:17 -04:00
Neerti
c17f1ee3e2 Merge pull request #1510 from Datraen/Poncho3-ReturnOfSanity 
Fixes swapped poncho sprites.
 2016-04-28 19:15:36 -04:00
Datraen
e1ab9fe6e6 Fixes swapped poncho sprites. 2016-04-28 18:56:05 -04:00
Datraen
f02c557603 Shuffles a line around. 2016-04-28 18:06:34 -04:00
Yoshax
4b0c6e7738 Fixes map locker 2016-04-28 21:44:38 +01:00
Yoshax
5d6e129ebf Adjusts HoS' locker capacity 2016-04-28 21:37:57 +01:00
Yoshax
f80d9efdb4 Adjusts HoS' locker capacity & moves CE's office camera 2016-04-28 18:10:10 +01:00
Datraen
a4816b8709 Merge pull request #1506 from Hubblenaut/voidsuits 
Adds object sprites for teshari voidsuits
 2016-04-28 10:46:54 -04:00