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
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
Mloc
29d4b9e422 Merge pull request #3561 from Erthilo/master 
Fixes, emotes, books
 2013-08-21 04:14:50 -07:00
ZomgPonies
b6d0fa7df3 More cult flavor text 2013-08-20 18:56:01 -04:00
ZomgPonies
a6e75de239 Rev Gamemode Fixes 2013-08-20 18:46:25 -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
ZomgPonies
cd4fe5affa Malf AI action - Robot Factory 2013-08-19 19:27:47 -04:00
ZomgPonies
9241865f15 Merge pull request #3 from Baystation12/master 
BS12:master > Poniesmaster
 2013-08-19 14:22:34 -07:00
Segrain
71e52b57fe Fix for #3552. 2013-08-19 23:25:03 +03:00
Segrain
18b26c57b7 Inertia fix. 2013-08-19 13:05:52 +03:00
Segrain
cd4eaecf21 Fix for #3549. 2013-08-19 13:05:00 +03:00
Chinsky
4262e6b6bc Merge pull request #3547 from Zuhayr/master 
Borer prompt, dionaea fix
 2013-08-19 01:27:11 -07:00
Zuhayr
67f3f5a3c4 Podmen prompt/spawn should work now. 2013-08-19 15:58:08 -07:00
Zuhayr
6d8bb8dfe6 Hopefully a fix for Dionaea weirdness regarding pods. 2013-08-19 11:53:24 -07:00
Kilakk
abe170e006 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	baystation12.dme
 2013-08-19 00:27:28 -04:00
Kilakk
8d2910da37 Bees are simple_animals, not machines. Bluh. 2013-08-18 22:52:39 -04:00
ZomgPonies
ebfa0a0fd2 Merge branch 'pr/2' 
Conflicts:
	baystation12.dme
	config/example/dbconfig.txt
 2013-08-17 15:22:49 -04:00
Zuhayr
9c58348879 Holodeck exploit fix. 2013-08-17 04:41:28 -07:00
Zuhayr
033b0450a0 Engineering merge. 2013-08-14 20:00:38 -07:00
Zuhayr
c19d136996 Podman fix. 2013-08-14 19:58:39 -07:00
Chinsky
b8dc7cc939 Merge pull request #3505 from Zuhayr/master 
Language cleanup/mouse speech fix.
 2013-08-13 16:48:45 -07:00
Zuhayr
e10a433800 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-14 01:01:18 -07:00
Zuhayr
623a2978b7 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2013-08-14 01:01:09 -07:00
Zuhayr
1bdb1b6694 Merge pull request #3507 from Segrain/master 
Internals for everyone.
 2013-08-13 16:39:14 -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
ZomgPonies
2adc744e65 Merge pull request #1 from Baystation12/master 
More patches from BS12:master
 2013-08-13 13:39:15 -07:00
Segrain
4e2ba5325a Internals box fix. 2013-08-13 21:06:38 +03:00
Zuhayr
bbfe26bde8 Merge pull request #3503 from Mloc/master 
Fully reverts clickdelay change.
 2013-08-13 05:20:35 -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
Segrain
2de41230c9 Merge remote-tracking branch 'upstream/master' 2013-08-13 13:41:24 +03:00
Segrain
ccb87c446a Vox beards. 2013-08-13 09:21:28 +03:00
Zuhayr
86c66ebcd4 Possible fix to weird podman behavior. 2013-08-13 14:51:39 -07:00
Zuhayr
254cef453a Added a preferences switch for diona. 2013-08-13 14:16:07 -07:00
Mloc
3a85e7afb2 Merge pull request #3495 from Zuhayr/master 
Vox carryover fixes.
 2013-08-12 07:03:55 -07:00
Zuhayr
bed45dd864 Removes Vox flavour text carried over from chargen. 2013-08-13 00:03:14 -07:00
Zuhayr
4874d5691b Removes multicultural mrowling Vox from Heist. 2013-08-13 00:00:34 -07:00
Zuhayr
44aa77f7de Adds a delay to the RCD when building. 2013-08-12 22:51:27 -07:00
Zuhayr
5476ae192d Attempting to reduce incidence of clickspam against mobs. 2013-08-12 22:44:57 -07:00
Mloc
82eb19df9a Merge pull request #3493 from Zuhayr/master 
Click delay fixes (part 1)
 2013-08-12 05:58:46 -07:00
Erthilo
9d1bbb16d0 Adds explosive implant admin messages, and jump button for explosions. 2013-08-12 12:34:13 +01:00
Zuhayr
b3e184ad0a Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-12 00:10:12 -07:00
ZomgPonies
c00c377d76 Re-adding clown/mime 2013-08-12 02:04:08 -04:00
ZomgPonies
c1272238e7 Revert "Revert "Moving files around to make code changes more modular from base BS12"" 
This reverts commit 79ff9683496a1e94b2b7cfff09234606d668b5ee.
 2013-08-12 02:04:07 -04:00
ZomgPonies
916256b400 Revert "Moving files around to make code changes more modular from base BS12" 
This reverts commit f0473c4abd99e66fd9f4225567f23ae89e354e2c.
 2013-08-12 02:04:07 -04:00
ZomgPonies
17d0a2232b Moving files around to make code changes more modular from base BS12 2013-08-12 02:04:07 -04:00
ZomgPonies
e3213894bd Items missing from map re-added. 2013-08-12 02:04:06 -04: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