cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-26 18:13:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,863 Commits 2 Branches 1 Tag
1d4567bfc47b5378123494de0879add7bc8cb935
Commit Graph

1907 Commits

Author SHA1 Message Date
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
SkyMarshal
e4d4173b97 Merge pull request #388 from Tastyfish/master 
job title choices! lizards speak normal, can pour things down sink
 2012-02-08 18:17:30 -08:00
Tastyfish
0ebbe456b3 job titles 2012-02-08 20:43:04 -05:00
SkyMarshal
710bcbb42b Final parts for the airlocks. 
Wrench -> Weld -> Wrench removes the cover
secure/centcom has all wires electrocute
Emag is now tweaked
Implanted uplink now works.
 2012-02-08 17:42:34 -07:00
Tastyfish
7b0a083a68 merge form upstream/master 2012-02-08 18:45:25 -05:00
Tastyfish
91635c4fbd Merge remote-tracking branch 'upstream/master' 2012-02-08 18:42:00 -05:00
SkyMarshal
bd756112a1 There. That /should/ make it work. 2012-02-08 14:18:49 -07:00
SkyMarshal
6f149af6ba *sigh* Lets hope that worked. 2012-02-08 13:48:34 -07:00
SkyMarshal
b967f6b577 Should make the engineer hacktool auto raise the bolts, at the cost of alerting the AI. 2012-02-08 13:46:10 -07:00
SkyMarshal
1e3f332efa Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	code/defines/obj/weapon.dm

Corrected a messed up type path for the security doors.
 2012-02-08 12:13:03 -07:00
SkyMarshal
ffb142abae Secure Airlock update! 
4 new wires, completely randomised! (2nd bolt wire, 2 only-drop-bolts wires, and an AI alert wire that alerts an AI 20% of the time, when messed with)
Emags have a limited number of uses, between 3 and 7, and cost 5 TC
Hacktools are more useful than they were, and have a lower chance of alerting the AI
(This is unmapped ATM)
 2012-02-08 12:07:12 -07:00
Melvin Melonstorm
f8f3f290c5 Fixed a bug with the wardrobe, changed a lot of strings and added a seal for the wardrobe, allowing people to check whether a wardrobe has been opened before or not. 2012-02-08 19:15:10 +01:00
CaelAislinn
b38922f163 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-02-08 18:16:09 +10:00
Albert Iordache
e96e8bc19d Moved the definitions of id cards from weapon.dm to weapons/cards_ids.dm 2012-02-08 08:10:15 +02:00
Tastyfish
7261167741 added modes to sink 2012-02-07 22:58:00 -05:00
CaelAislinn
22811eaf26 added personal lockers to most departments, balanced job equipment between wardrobe closet and locker, miscellaneous tweaks (including fix to taj whisp/speak, it should work fine now except for radios) 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-08 11:47:07 +10:00
Albert Iordache
7df0181e60 Code cleanup: renamed the ID card's variable "registered" to "registered_name" for better clarity 2012-02-07 20:05:43 +02:00
Albert Iordache
a20481062c Cleaned up parts of the code, no other changes 2012-02-07 20:05:42 +02:00
SkyMarshal
d26767127e Merge pull request #379 from caelaislinn/master 
autolathe bug fix
 2012-02-07 08:09:41 -08:00
CaelAislinn
a9df0e64bf fixed autolathe perma-freeze bug, also fixed some icon states. 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-08 02:07:10 +10:00
Miniature
22687953fc Another runtime fix, I believe this to originally be caused by the automatic arrival announcement thing not having a source mob 2012-02-08 01:28:55 +10:30
SkyMarshal
be9bcd626d Merge pull request #376 from Tastyfish/master 
streamlined copy machine, mainly to not use process()
 2012-02-06 19:59:01 -08:00
Tastyfish
b0113eaac9 Merge pull request #375 from caelaislinn/master 
bug / map fixes
 2012-02-06 19:30:51 -08:00
SkyMarshal
e432958ab5 Bugfixes for airlocks 
Added detective work manual, that spawns on top of the detective's computer
Added RadioAlert proc
Added the capability to title the NanoTrasen updates
 2012-02-06 20:24:00 -07:00
CaelAislinn
1366bf7e34 Merge git://github.com/Baystation12/Baystation12 
Conflicts:
	code/defines/procs/gamehelpers.dm
	code/game/mecha/mecha.dm
	maps/tgstation.2.0.8.dmm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-07 09:08:55 +10:00
CaelAislinn
06fad98469 fixed mech charge port bug, fixed (?) autolathe bug, miscellaneous map fixes 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-07 08:05:47 +10:00
CaelAislinn
9ca058fd1b added a couple of missing networks to department camera monitors 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-07 06:59:35 +10:00
Tastyfish
d2404e8a79 Merge remote-tracking branch 'upstream/master' 2012-02-06 13:41:59 -05:00