cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 02:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,322 Commits 26 Branches 2 Tags
ef7cdabebf69e6fd5ce2e7edbb7f883b4c41cc5d
Commit Graph

2911 Commits

Author SHA1 Message Date
ZomgPonies
d20f88bf58 Added ghettobombs and bananades 2013-09-14 02:40:39 -04:00
ZomgPonies
653f8d4741 Cut disposal damage by half 2013-09-14 02:39:34 -04:00
ZomgPonies
829fc397a3 picking up stools fix 2013-09-13 13:30:14 -04:00
ZomgPonies
2e1380adbc thrown stunbaton damage fix 2013-09-13 13:30:04 -04:00
ZomgPonies
de2210775a Made Spesslaw book point to OUR wiki's spesslaw page 2013-09-12 15:44:29 -04:00
ZomgPonies
e38d18b7f9 HONKputer sprites and files 2013-09-11 21:02:42 -04:00
ZomgPonies
7213a6d26a Shouldn't have put that in the dme 2013-09-11 19:18:34 -04:00
ZomgPonies
6e2d0eee6f New PDA painter item 2013-09-11 17:27:51 -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
c55cfc77f8 Minor fix to help with airflow in allum areas 2013-09-10 09:20:19 -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
7ffdc68add Adding /tg/'s laserpointers 2013-09-06 08:31:28 -04: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
Segrain
7dae19a3f9 Fix for #3498. 2013-08-30 04:40:39 +03: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
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
Segrain
40909bde53 Deconstruction fix. 2013-08-23 15:31:37 +03:00
Segrain
57c1a9a556 Code cleanup. 2013-08-22 10:11:49 +03:00
Mloc-Argent
5cee2d2ac2 Species will no longer draw hair not allowed for them. Mirrors will no longer let you choose disallowed hair styles. 2013-08-21 23:26:59 +01:00
ZomgPonies
589a58a250 Fixes plastic flap locker exploit 2013-08-21 18:09:22 -04:00
ZomgPonies
447b79e959 Clown fixes: Access, Waterflower can be filled with anything 2013-08-20 18:37:47 -04:00
Erthilo
13caefe138 Uncomments Space Law book content. 2013-08-20 14:20:46 +01:00
Zuhayr
033b0450a0 Engineering merge. 2013-08-14 20:00:38 -07:00
DJSnapshot
cb20332de5 Added potential for chief engineer's locker to spawn with either a brown vest or webbing 2013-08-13 16:16:20 -07:00
Mloc-Argent
71bdaa1698 Fully reverts clickdelay change. 
It was immensely buggy with certain mobs, and server lag all but negated the benefits.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-13 13:10:09 +01:00
Mloc
82eb19df9a Merge pull request #3493 from Zuhayr/master 
Click delay fixes (part 1)
 2013-08-12 05:58:46 -07:00
Zuhayr
44aa77f7de Adds a delay to the RCD when building. 2013-08-12 22:51:27 -07:00
Erthilo
9d1bbb16d0 Adds explosive implant admin messages, and jump button for explosions. 2013-08-12 12:34:13 +01:00
Zuhayr
375437a6cf Changelog merge. I hate the changelog. 2013-08-12 11:20:41 -07:00
Erthilo
459aafd523 Fixed borg sprites no resetting with reset board. 2013-08-11 21:32:02 +01:00
Erthilo
070cb50f8d PDAs can be used when buckled (and not in any other way restrained or stunned). Rejuvenate now completely heals a target or broken organs and viruses too. 2013-08-11 17:13:58 +01:00
Segrain
935a7f30ea Typo fix. 2013-08-11 09:22:20 +03:00
Zuhayr
840468cb14 Fixed the order of update/return statements for dispenser. 2013-08-08 23:17:38 -07:00
Zuhayr
23301d9b73 Made dispensers unwrenchable. 2013-08-08 22:56:31 -07:00
comma
e45f429e4c Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
	maps/tgstation.2.1.0.0.1.dmm
 2013-08-04 01:40:32 +04:00
Zuhayr
a470444963 TEMPORARY fix for the too-many-strings RSC corruption issue. 2013-08-03 09:21:53 -07:00
Zuhayr
618afa1be7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2013-08-03 09:16:41 -07:00
Zuhayr
a8c04cefc6 Merge. 2013-08-03 09:14:20 -07:00
Segrain
d51809faa2 Separating autoinjectors box from injector box. 2013-08-02 19:30:02 +03:00
Segrain
c2712dd9d3 Fix for #3410. 2013-08-01 20:58:35 +03:00
comma
95f00d0523 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into medtweaks 2013-08-01 10:03:46 +04:00