cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-31 07:57:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,923 Commits 15 Branches 2 Tags
44e4c6a3326d9104f8130906a5f67e53f45b38fc
Commit Graph
1934 Commits
Author SHA1 Message Date
Miniature 44e4c6a332 Made labels able to be stuck on containers (issue #430) 2012-02-18 05:39:30 +10:30
Melvin Melonstorm 8c0290bce0 FINALLY made the captain's PDA not start out with messaging disabled, 
and also fixed Scientist's closets, probably. Added a missing window in
the map.
 2012-02-16 19:40:58 +01:00
CIB 1bdde438e5 Merge pull request #435 from AppleMaster/master 
Random barsigns.
 2012-02-16 08:37:01 -08:00
Albert Iordache cc6c63edd7 Merge pull request #423 from caelaislinn/master 
added a couple of new clothing items, updated some sprites
 2012-02-16 08:29:15 -08:00
Jimapples ecc25f0580 Added randomised barsigns, again! 
Signed-off-by: Apples <chicken_face@ymail.com>
 2012-02-16 15:35:21 +00:00
SkyMarshal 8769fdd3fc Merge pull request #432 from Tastyfish/master 
ported in a bunch of the old food making stuff
 2012-02-15 19:11:30 -08:00
Tastyfish 4ce36641ea Merge remote-tracking branch 'upstream/master' 2012-02-15 20:06:49 -05:00
Tastyfish 7149b98a9d improved library code 2012-02-15 20:06:24 -05:00
SkyMarshal 58d7da9008 Missing blood_DNA now goes into admin logs and stuff. 2012-02-15 10:26:22 -07:00
SkyMarshal b5c1d99471 Added some more feedbacks on the blood_DNA stuff 
Fixed up some chemistry stuff
Nitrogen now adds atmospheric nitrogen when splashed on the ground.
 2012-02-14 21:34:52 -07:00
SkyMarshal 5e332d297d Added a sanity check, added some feedback stuff to help identify WTF is happening with blood. 2012-02-14 19:58:21 -07:00
CaelAislinn 95b521dede Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-02-15 07:04:43 +10:00
CaelAislinn 9d798d3f95 updated some sprites, added new clothing 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-15 06:58:50 +10:00
CIB 9d12cf6c12 Merge pull request #422 from SkyMarshal/master 
More update_clothing() calls.
 2012-02-14 11:15:42 -08:00
SkyMarshal 7e140afe56 Added more update_clothing() calls 2012-02-14 12:12:42 -07:00
Tastyfish badb7bd93f Merge remote-tracking branch 'upstream/master' 2012-02-14 12:01:14 -05:00
Tastyfish 12d119c109 porting old food stuff 2012-02-14 11:59:16 -05:00
Albert Iordache aa04eed7e8 Merge pull request #417 from SkyMarshal/master 
Should reduce lag, mobs no longer update icons ever tick.
 2012-02-14 04:20:00 -08:00
SkyMarshal 3a2beedb15 Merge pull request #412 from Miniature/master 
Reduced max positions for a bunch of jobs
 2012-02-14 02:56:52 -08:00
SkyMarshal 0fe42327a5 This should hopefully reduce processing requirements, by not rebuilding icons every tick. 
(Ported oldcode, all props to Strumpetplaya)
 2012-02-13 21:54:22 -07:00
SkyMarshal 3fbcbfe448 Merge pull request #416 from SkyMarshal/master 
Bugfixes for Borg&Doors
 2012-02-13 15:58:17 -08:00
SkyMarshal 42be0feff6 Bugfix for borgs&doors as well as chem grenades. 2012-02-13 16:56:34 -07:00
Mloc b690b1386f Hotkeys here! Adds alt-click (pull object), ctrl-Q and ctrl-E (cycle backwards and forwards through the intents). 
Signed-off-by: Mloc <colmohici@gmail.com>
 2012-02-13 20:18:17 +00:00
Miniature 96353ded8d Reduced max permissions for a bunch of jobs 
botanist
atmos tech
roboticist
geneticist
chemist
 2012-02-14 02:39:59 +10:30
Tastyfish 8b6441d8d0 Merge remote-tracking branch 'upstream/master' 2012-02-13 01:12:13 -05:00
Tastyfish 47ec6a7021 re-renable things, now that things aren't exploding 2012-02-13 01:01:33 -05:00
SkyMarshal 6cb78379c3 Fixes for DOOMFIRES. 2012-02-12 15:00:43 -07:00
Mloc 1d4567bfc4 Merge pull request #404 from Uristqwerty/master 
Three fixes for the Runtime Errors topic.
 2012-02-12 12:01:06 -08:00
SkyMarshal c2e4a64201 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-02-12 12:48:16 -07:00
SkyMarshal 3d284270f7 Fix for command reports and hacktools. 2012-02-12 12:47:36 -07:00
Uristqwerty 8e84ff57df Three fixes for the Runtime Errors topic. 
- null.check_tile_graphic() in FEA_system
- "Cancel".network in /proc/camera_network_sort
- "d699999427062f612349cb4948a6eb...".len (Might not be fixed entirely, but I fixed one place that it was being set incorrectly)
 2012-02-12 13:54:52 -05:00
Albert Iordache 844ebef867 Merge pull request #403 from Tastyfish/master 
can eat normally with fork, med console upgrade
 2012-02-12 10:54:07 -08:00
Albert Iordache c0ba7f227d Fixed cloning-related runtime error. 2012-02-12 19:58:24 +02:00
Tastyfish 0dc9bc325b upgraded medical console to be like sec console 2012-02-12 09:55:02 -05:00
Tastyfish aeafc2ffa5 can eat all foods with fork like a sane person now 2012-02-12 07:07:16 -05:00
Tastyfish bf502d4dd4 forgot to push this file with job updates, gives doc virology access 2012-02-12 04:25:01 -05:00
Albert Iordache a6f89fefee Merge pull request #398 from caelaislinn/master 
new custom items
 2012-02-10 14:32:38 -08:00
CaelAislinn 0edd231592 added new custom items 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-11 07:24:50 +10:00
Head bff5a0fecc Added new shortcut for examine (ctrl + left click). 2012-02-10 20:36:55 +01:00
Tastyfish bd6fbb5fe8 fix to sky's reagent effects changes 2012-02-10 00:07:29 -05:00
Tastyfish 1332516180 Merge remote-tracking branch 'upstream/master' 2012-02-09 23:59:30 -05:00
SkyMarshal 1d29574bc3 Part 2 of the WIP chemistry stuff 
Map update with secure doors!
 2012-02-09 21:50:50 -07:00
Tastyfish e922a7fadb bugfix: wall not hiding level 1 pipes 2012-02-09 23:31:04 -05:00
CaelAislinn 4021891986 missing files 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-10 09:33:48 +10:00
CaelAislinn 03f970de65 Merge branch 'master' of git://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/objects/closets/secure/engineering.dm
	maps/tgstation.2.0.8.dmm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-10 09:11:08 +10:00
Albert Iordache 13ca13558f Merge pull request #391 from SkyMarshal/master 
Cleaned up fingerprint code.
 2012-02-09 09:58:34 -08:00
SkyMarshal 8b62eff01a Cleaned up the fingerprint code 
Added sanity checks to the clean blood proc.
 2012-02-09 09:42:08 -07:00
Tastyfish 92dc961c10 disable meteors for now, until atmos fixed 2012-02-09 01:29:21 -05:00
Tastyfish 8eef84095b Merge pull request #389 from Tastyfish/master 
oops, left in a debug output
 2012-02-08 21:18:50 -08:00
Tastyfish a7fcef6d45 oops, left in debug code 2012-02-09 00:17:54 -05:00