cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-23 16:03:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,489 Commits 29 Branches 2 Tags
e201bcbe0e9bd57e83af02e4e70c8a4e5a1d5014
Commit Graph

3489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SkyMarshal
e201bcbe0e fixed a derp in ion storm laws. Conflicted with NT laws. 2012-01-20 17:06:23 -07:00
SkyMarshal
81e9d3cf68 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-20 16:41:29 -07:00
SkyMarshal
94c38b8206 Fixed book titles not showing up properly in some instances, Death alarm is now labeled as such, robot lighter works right. 2012-01-20 16:40:55 -07:00
CIB
9683d3ca74 Merge pull request #302 from SkyMarshal/master 
The interaction screen now updates properly.
 2012-01-20 14:27:31 -08:00
SkyMarshal
6e34145dac Removed debugging prompt stuff. 2012-01-20 14:30:24 -07:00
SkyMarshal
722bbee324 Interaction window now updates properly. 2012-01-20 14:27:29 -07:00
SkyMarshal
9c50c1b43b Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-20 13:16:12 -07:00
SkyMarshal
e806e95f79 Working to make the inventory auto refresh. 2012-01-20 13:15:50 -07:00
CIB
798e0d7850 Merge pull request #300 from SkyMarshal/master 
Response team pimped out, several other fixes.
 2012-01-20 12:02:38 -08:00
SkyMarshal
a08f21f36f Fixed typo2 2012-01-20 12:57:44 -07:00
SkyMarshal
12c6564e32 Fixed Typo1 2012-01-20 12:57:13 -07:00
SkyMarshal
cd5f8dd0b5 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-20 12:53:43 -07:00
SkyMarshal
1bf1d5db1f Pimped out the response team. No jobs have stupid stuff spawn in their hands, it now spawns on their person, be it on their ear (pens if they cannot find a target) of in their pockets. MAde several pre-set-up things for the response team, including portable surgery equipment and a movable optable. Made autolathe items spawn on top of it. Added Death alarms, and made explosive implants work properly. Girders are now removed when a floor is made/RCD'd into existence. Internals can now be set even if it is in suit storage or on the belt. 2012-01-20 12:53:29 -07:00
Albert Iordache
495d9249da Merge pull request #297 from Tastyfish/master 
added 4-way manifold, t-valve (like a railroad switch)
 2012-01-20 03:12:54 -08:00
Tastyfish
d40bfca541 Merge pull request #298 from caelaislinn/master 
fixed autolathe queueing bug
 2012-01-19 22:03:37 -08:00
Tastyfish
ce27d4f15b bugfixed an icon state name to what code expects 2012-01-20 00:03:46 -05:00
Tastyfish
d1a9a254ef Merge remote-tracking branch 'upstream/master' 2012-01-19 23:45:14 -05:00
Tastyfish
e84e6cfd50 added 4-way manifold, t-valve (like a railroad switch) 2012-01-19 22:04:50 -05:00
Albert Iordache
df354af1f3 Merge pull request #294 from Tastyfish/master 
added L & R to zone_sel hud thing, check antag call shuttle, marked datum call proc
 2012-01-19 11:01:04 -08:00
CaelAislinn
143d3daeba Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-01-20 00:53:49 +10:00
CaelAislinn
d9b1d95a70 fixed autolathe queueing bug 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-20 00:51:40 +10:00
Tastyfish
676c3fa412 wrapping paper for me 2012-01-19 03:34:55 -05:00
Tastyfish
51780a5c05 Merge pull request #291 from SkyMarshal/master 
Radio and map update.
 2012-01-18 23:16:15 -08:00
SkyMarshal
18bd946668 Finally fixed the access stuff for medbay. It was a bug introduced by Doohl. 
Also made electric chairs amazing, but the sprite needs work.
 2012-01-19 00:12:24 -07:00
Tastyfish
06fce40d34 herped the mark datum thing 2012-01-19 01:54:48 -05:00
Tastyfish
1be9c4cfed check antag "call shuttle" overrides fake recall, can use marked datum as arg in the bs12 call proc command 2012-01-19 01:19:58 -05:00
Tastyfish
0365700f21 Merge remote-tracking branch 'upstream/master' 2012-01-19 00:26:44 -05:00
Tastyfish
7737c5b50c Merge pull request #288 from CIB/master 
Blobs need oxygen now
 2012-01-18 20:55:58 -08:00
Tastyfish
8bf76307e8 added L & R to zone_sel hud thing 2012-01-18 23:53:02 -05:00
SkyMarshal
d0e8ceec58 Bugfix for access problems. 2012-01-18 11:48:37 -07:00
SkyMarshal
bd97d9cdfd Latest TG radio update. Nuke agents can now hear all radio, which is intercepted to their frequency. Remapped some stuff making the Comm Sat actually accessible by people with access. 2012-01-18 11:14:20 -07:00
Hawk-v3
7358dfa1a8 Merge pull request #289 from Tastyfish/master 
allow non-MMI brains to ghost (since they can't do anything), admin-spawnable bone repairing syrum
 2012-01-17 18:03:09 -08:00
Tastyfish
cc449f48c6 Merge remote-tracking branch 'upstream/master' 2012-01-17 20:36:03 -05:00
Tastyfish
d1fc384533 allow non-MMI brains to ghost (since they can't do anything), admin-spawnable bone repairing syrum 2012-01-17 20:34:12 -05:00
Tastyfish
c6b7ddc84b Merge pull request #287 from Abi79/master 
TG update: Vending machine GUI overhaul.
 2012-01-17 16:44:26 -08:00
SkyMarshal
c8bbba7a71 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-17 08:48:35 -07:00
SkyMarshal
ded268cab9 Bugfix for ID access and map. 2012-01-17 08:48:01 -07:00
Albert Iordache
fe65cb88d9 Removed the ads from the vending machines. 
Now, I like puns, but you see, some were horrible.
 2012-01-17 11:59:48 +02:00
vageyenaman@gmail.com
9cc379273e TG update: Vending machine GUI overhaul. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2694 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-17 11:49:03 +02:00
Albert Iordache
a8e43a29d9 Removed duplicate sprites from stationobjs.dmi 2012-01-17 11:39:05 +02:00
Albert Iordache
a253e02dda Merge pull request #282 from Uristqwerty/master 
Slightly modified A* improvement
 2012-01-17 00:57:07 -08:00
SkyMarshal
f509cda7b0 Merge pull request #284 from Tastyfish/master 
added orderable chickens and cows
 2012-01-16 23:17:36 -08:00
Tastyfish
931567a71e Merge pull request #286 from SkyMarshal/master 
Full port of TG radio system.  Updated to TG revision: r2968
 2012-01-16 23:16:30 -08:00
SkyMarshal
0d7ce5f347 Port of the TG radio system. Tasty and I tested it out and it works smooth and clean :) 
We were able to restore functionality after we blew up half the radio equipment, as well.
AI satellite is now the Comms satellite.
 2012-01-17 00:12:30 -07:00
Tastyfish
53baf4755f Merge remote-tracking branch 'upstream/master' 2012-01-16 20:27:36 -05:00
Tastyfish
df208f7189 added orderable chickens and cows 2012-01-16 20:26:17 -05:00
cib
9dfec57e18 Blob now requires oxygen to grow. 2012-01-16 12:13:15 -08:00
Albert Iordache
26e12e26d0 Merge pull request #283 from caelaislinn/master 
minor map changes (removed random coatracks and derpy lights)
 2012-01-16 06:44:35 -08:00
CaelAislinn
5b7dfcbbc5 removed coatracks from RD and CMO offices 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-16 23:38:02 +10:00
Albert Iordache
c2ce0fc1a2 Fixed a map error and made the CMO's office a bit larger. 2012-01-16 00:34:52 +02:00