cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-05-01 20:41:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 11 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

9304 Commits

Author SHA1 Message Date
ZomgPonies
40d0129fbc Cloning balance adjusted 2013-09-10 19:31:35 -04:00
ZomgPonies
b21332c143 MOAR mutations! 2013-09-10 18:27:17 -04:00
ZomgPonies
6c2ae0a263 Added kit system to vending machine to map for alien hardsuits 2013-09-10 15:11:50 -04:00
ZomgPonies
692b8efdeb Added BS12 genetics 2013-09-10 15:11:22 -04:00
ZomgPonies
5ef69a8899 Updated stunbaton with on/off in-hand state 2013-09-10 15:11:01 -04:00
ZomgPonies
b3aadbf02e Added some /tg/ random events 2013-09-10 15:10:26 -04:00
ZomgPonies
0f9b693068 Made Virologist into it's own job 2013-09-10 12:04:49 -04:00
ZomgPonies
c55cfc77f8 Minor fix to help with airflow in allum areas 2013-09-10 09:20:19 -04:00
ZomgPonies
3bb7a173cf A bunch of nano UI fixes + new Chem Dispenser UI! 2013-09-09 18:40:26 -04:00
ZomgPonies
b7c1d5ea51 First Two custom Nanotrasen Rep items added in 
Added in special cane that is also harmbaton
Added in special gold zippo lighter
 2013-09-09 17:08:03 -04:00
ZomgPonies
c1222034ee BS12 -> Ponies merge 2013-09-09 10:51:16 -04:00
ZomgPonies
a935863200 Made blob gamemode work, removed ninjas because needs overhaul, optimized some strings 2013-09-08 11:39:33 -04:00
ZomgPonies
ea91047ce2 Janicart/Ambulance overhaul && Added Doppler Array sprites & map 2013-09-08 09:23:49 -04:00
ZomgPonies
e92ddce760 Updated map 2013-09-07 18:00:31 -04:00
ZomgPonies
65b0375858 Added Nanotrasen Rep to joblist 2013-09-07 14:15:18 -04:00
ZomgPonies
b3f5923ade Trying out new ZAS system 2013-09-07 09:22:51 -04:00
ZomgPonies
7d5b46660c SSD Auto-kick/free job script 2013-09-07 01:30:56 -04:00
ZomgPonies
bdb79d262c Missing line for malf AI robfactory 2013-09-06 14:26:27 -04:00
ZomgPonies
a784670e21 Lowering string count 2013-09-06 13:07:54 -04:00
ZomgPonies
7ffdc68add Adding /tg/'s laserpointers 2013-09-06 08:31:28 -04:00
ZomgPonies
2d868b1b37 Merge branch 'master' of https://github.com/ZomgPonies/Baystation12 2013-09-06 06:42:31 -04:00
ZomgPonies
34820b915a Civilian fix 2013-09-06 06:42:27 -04:00
ZomgPonies
4e7b8599e3 Merge pull request #6 from Kodos-Atoz/master 
Added Job Alt-Titles
 2013-09-06 03:07:04 -07:00
Kodos-Atoz
f848c5c4d6 Update civilian.dm 2013-09-06 04:41:25 -05:00
Kodos-Atoz
3bdb2a5b00 Update civilian.dm 
Added Job Titles
 2013-09-06 04:39:41 -05:00
Kodos-Atoz
27b4205f03 Update civilian_chaplain.dm 
Added misc Job Titles
 2013-09-06 04:31:22 -05:00
ZomgPonies
7ff012a58a Female Clowns/Mimes get their own clothes 2013-09-06 05:30:44 -04:00
Kodos-Atoz
7dbddd9835 Update medical.dm 
Added misc job titles
 2013-09-06 04:18:29 -05:00
ZomgPonies
ed8714550c Merge branch 'master' of https://github.com/Baystation12/Baystation12 into Baystation12-master 
Conflicts:
	config/example/config.txt
	config/example/motd.txt
	config/example/rules.html
 2013-09-05 13:29:34 -04:00
Mloc-Argent
a084f74c7d Expansion of every "icon = ''" path. 
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-01 21:53:36 +01:00
Mloc
2454d72233 Merge pull request #3620 from Segrain/master 
Bugfix.
 2013-08-31 08:07:26 -07:00
Segrain
7dae19a3f9 Fix for #3498. 2013-08-30 04:40:39 +03:00
Erthilo
a7f1b50f1b Fixes reagent and throw logging. 2013-08-30 00:38:10 +01:00
Segrain
8d1fdd87b3 Typecheck fix. 2013-08-29 02:24:40 +03:00
Zuhayr
3762fcc4a8 Merge pull request #3610 from Mloc/master 
Space no longer freezes mobs.
 2013-08-28 10:48:57 -07:00
Mloc-Argent
9fed22c056 Space no longer freezes mobs. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-28 18:49:00 +01:00
Mloc
208ef684ad Merge pull request #3603 from Erthilo/master 
Fixes Thermite
 2013-08-28 06:06:54 -07:00
Mloc
489e037bcd Merge pull request #3599 from Erthilo/master 
Logs, lots and lots of logging, glass shards and suits, Prison button
 2013-08-28 05:37:01 -07:00
Erthilo
8ee601aa9a Fixes thermite runtimes. 2013-08-28 13:27:07 +01:00
Erthilo
3557e12943 Suits with shoes protect against glass shards. 2013-08-28 12:49:23 +01:00
Erthilo
0cb361f737 Removed undeeded "ATTACK:" 2013-08-28 03:37:11 +01:00
Erthilo
3fbdc99079 Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs. 2013-08-28 03:33:04 +01:00
Philip
66071c81ba Update door_control.dm 
The var desiredstate doesn't update when the airlock closes automatically and so most of the time players have to hit the button twice. This keeps all functionality but with one button press.
 2013-08-27 16:38:07 -06:00
ZomgPonies
88cd7f1577 Makes windows and grilles garbage collect. 2013-08-25 02:01:00 -04:00
ZomgPonies
91bc429721 Merge branch 'pr/4' 
Conflicts:
	.gitignore
 2013-08-24 17:25:58 -04:00
Kilakk
e634cd01f2 Fixes #3517 2013-08-23 14:21:08 -04:00
Segrain
40909bde53 Deconstruction fix. 2013-08-23 15:31:37 +03:00
Segrain
cd2922cebe Name fix. 2013-08-23 15:30:49 +03:00
Segrain
acb4a01b9d Compile fix. 2013-08-23 10:42:29 +03:00
Mloc-Argent
1106845cb6 further checks against mobs being loaded by hydraulic clamps. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-22 15:54:28 +01:00