Zuhayr
f1b77d0ed6
Master merge.
2014-02-05 18:34:23 +10:30
Zuhayr
e073271f19
Merge pull request #4383 from Iamgoofball/master
...
Because we HAVE to define Del() three times
2014-02-04 15:22:17 -08:00
Iamgoofball
2ec805630e
Because we HAVE to define Del() three times
...
/obj/item/device/gps/Del()
GPS_list.Remove(src)
..()
/obj/item/device/gps/Del()
GPS_list.Remove(src)
..()
/obj/item/device/gps/Del()
GPS_list.Remove(src)
..()
2014-02-04 11:30:35 -08:00
Chinsky
e7c22c28c7
Merge pull request #4379 from Segrain/master
...
Smallfix.
2014-02-04 01:44:32 -08:00
Chinsky
a266274ac3
Merge pull request #4378 from Segrain/dev
...
Dev update.
2014-02-04 01:44:20 -08:00
Segrain
4b8d5c4f14
Code cleanup.
2014-02-04 08:16:06 +03:00
Chinsky
e9fa9d6329
Merge pull request #4380 from DJSnapshot/hotfix
...
Fix to Papadrow's custom item.
2014-02-03 07:45:39 -08:00
DJSnapshot
39820724d2
Fix to Papadrow's custom item dress.
2014-02-03 07:34:27 -08:00
Chinsky
9a4bcc60b4
Merge pull request #4377 from Ccomp5950/ai_announcements_tease
...
Commented out the AI Announcement verbs
2014-02-02 23:30:55 -08:00
Segrain
83246df6d5
Fix for #4297 .
2014-02-03 07:32:53 +03:00
Segrain
9ff5776c9f
Pepperspray safety.
2014-02-03 05:10:04 +03:00
Segrain
1039fc9eaf
Spray sizes.
2014-02-03 05:08:08 +03:00
Segrain
54d2a261f3
Helper for cycling through list.
2014-02-03 05:02:18 +03:00
Segrain
6af8f01cab
Code cleanup.
2014-02-03 05:00:15 +03:00
Segrain
3ab805f7c9
Moving flasks into Booze-O-Mat.
2014-02-03 04:55:42 +03:00
Segrain
4fe85651b6
Taperolls for cyborgs.
2014-02-03 04:46:47 +03:00
Segrain
cec9b87289
Folder recipes.
2014-02-03 04:45:42 +03:00
Segrain
55605624eb
Gamemode autovote.
2014-02-03 04:43:38 +03:00
Segrain
fcc4560e92
Displaying delayed time.
2014-02-03 04:38:38 +03:00
Segrain
b7059519c2
Merge remote-tracking branch 'upstream/master' into dev
2014-02-03 04:36:03 +03:00
Ccomp5950
3a54d96b7a
Merge pull request #4374 from Loganbacca/bayfix
...
Broken heart fix
2014-02-02 17:22:25 -08:00
Ccomp5950
35f534854a
Commented out the AI Announcement verbs
...
Now the AI won't get it's hopes up that it can have the
CAPTAIN REPORT TO THE BAR FOR JOHNSON INSPECTION
2014-02-02 16:57:07 -06:00
Loganbacca
70a1c768ad
Broken heart fix
...
Code was using a switch with variables in it. This doesn't work.
Replaced it with an if..else sequence.
Thanks to the guys from Paradise for finding this.
Note: this only fixes literal heart problems, it won't do anything for relationship issues.
2014-02-03 00:28:15 +13:00
Chinsky
9ba4bcecdf
Merge pull request #4367 from RavingManiac/dev
...
smexy
2014-02-02 03:20:32 -08:00
Chinsky
743c8ec18e
Merge pull request #4372 from Segrain/master
...
Small fixes.
2014-02-02 03:12:45 -08:00
Chinsky
217a8266b9
Merge pull request #4371 from Ccomp5950/typo_fix
...
america is dumb though
2014-02-02 03:09:42 -08:00
Chinsky
d7d9141adf
Merge pull request #4370 from Ccomp5950/metal_fix
...
Bugfix: Misc science, 50 metal, not 5000
2014-02-02 03:09:04 -08:00
RavingManiac
a750ca5c0d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-02-02 16:04:37 +08:00
RavingManiac
30915b5ba4
Escape shuttle modified after feedback.
...
Wall emergency lockers now contain two breath masks and two emergency oxygen tanks.
Emergency ration crates contain two boxes of donk-pockets. The escape shuttle has two crates at the back.
2014-02-02 16:04:11 +08:00
Segrain
0e2ff8b00b
Fix for #4011 .
2014-02-02 02:34:30 +03:00
Segrain
88e7dbb67f
Fix for mods counting.
2014-02-02 02:33:53 +03:00
Ccomp5950
0980493981
Merge pull request #4368 from Loganbacca/prefs
...
Character setup underwear rendering
2014-02-01 14:58:38 -08:00
Ccomp5950
d38af0c44b
Typo fix: corpotate -> corporate.
...
And superfluous U removal 'MURIKA!
2014-02-01 15:25:00 -06:00
Ccomp5950
446d36af18
Bugfix: Misc science, 50 metal, not 5000
...
Was fixed before but probably a bad mapmerge removed it.
2014-02-01 15:16:34 -06:00
RavingManiac
5223888f70
Replaced fatscape shuttle with sleeker, nicer-looking shuttle.
...
Added swall_floor_f5, swall_floor_f6, swall_floor_f9 and swall_floor_f10, which are smooth interior shuttle wall corners. Shuttles modified to use these instead of the blocky corners or two different overlaid turfs.
Notice board added to engineering.
2014-02-02 03:38:43 +08:00
Zuhayr
e79fb1d890
Merge pull request #4366 from RKF45/dough
...
Reintroducing the dough-based cooking system.
2014-02-01 05:13:10 -08:00
Chinsky
3a913e426c
Merge pull request #4360 from RKF45/dev
...
I am doing that just for genetecists wearing monkey suits.
2014-02-01 03:33:54 -08:00
Chinsky
0ae6bdfedc
Merge pull request #4362 from SueTheCake/dev
...
Visual update of security explosive ordinance disposal suit.
2014-02-01 03:31:11 -08:00
Chinsky
79fd66c685
Merge pull request #4364 from Loganbacca/collars
...
Suit collars
2014-02-01 03:30:36 -08:00
RKF45
4b6dc4d257
Diona roasts needs cooperation for acid
2014-02-01 11:16:55 +01:00
Loganbacca
6bf6f6d849
Added underwear rendering to character setup screen
...
Also culled unused underwear names from global_lists.dm
2014-02-01 17:53:13 +13:00
RKF45
8fbcda2a0b
Reintroducing the dough-based cooking system.
2014-02-01 02:17:38 +01:00
Loganbacca
44498dc5eb
Tail rendering fix
...
Spotted this while working on collars code
Moved tail layer before hand layers, so tails don't render over held items
2014-02-01 13:30:18 +13:00
Loganbacca
c6964b1a1a
Cleaned collar rendering code
...
Removed colon
Removed need for collar variable
Corrected TOTAL_LAYERS define
2014-02-01 13:25:09 +13:00
Mloc
2a93f440d4
Merge pull request #4365 from Ccomp5950/deadchat_sanitize
...
Deadchat sanitized so players can't use HTML.
2014-01-31 14:43:15 -08:00
Ccomp5950
e72c824b90
Deadchat sanitized so players can't use HTML.
2014-01-31 16:41:12 -06:00
DJSnapshot
810de4ddaa
Merge pull request #4337 from Baystation12/dev-freeze
...
0.1.8 Staging [Do not merge]
2014-01-31 12:40:15 -08:00
Mloc
387117932d
Merge pull request #4363 from Segrain/master
...
Smallfixes.
2014-01-31 12:22:04 -08:00
Segrain
ece3556143
Smallfix.
2014-01-31 16:31:17 +03:00
Segrain
4df59faf76
Surgery tracking.
2014-01-31 16:28:24 +03:00
