Tigercat2000
e60799474b
tgshuttles unfinished
2015-12-03 10:59:06 -08:00
Tastyfish
f839b43bcc
Merge remote-tracking branch 'origin/inputfix' into inputfix
...
Conflicts:
code/_onclick/hud/screen_objects.dm
code/game/dna/genes/vg_powers.dm
code/modules/admin/verbs/adminhelp.dm
code/modules/economy/EFTPOS.dm
code/modules/mob/living/silicon/robot/life.dm
2015-11-30 22:44:55 -05:00
Tastyfish
280fc65938
added cancel to more powers, hand tele, cleanups to others
2015-11-30 22:30:57 -05:00
Tastyfish
897313844b
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into inputfix
...
Conflicts:
code/modules/mob/living/silicon/robot/life.dm
2015-11-30 21:54:22 -05:00
Aurorablade
2f28c537c4
Removes Null
2015-11-30 07:46:06 -05:00
Aurorablade
8b39fa3bb1
Fixes custom enemy communications
2015-11-30 01:25:12 -05:00
Tastyfish
e2f67a4260
fixed various inputs to be cancel-able
2015-11-30 01:06:20 -05:00
Tastyfish
340068a25a
fixed various inputs to be cancel-able
2015-11-29 18:30:30 -05:00
ZomgPonies
a94e4651d4
Replace one typo by another gg
2015-11-25 15:05:38 -05:00
ZomgPonies
428db7a842
Fixes enemy communications
2015-11-25 15:04:22 -05:00
ZomgPonies
e9df2e0627
Allows for command reports to come from other people than centcom
2015-11-23 18:13:47 -05:00
Fox-McCloud
c4341992d1
last tweaks
2015-10-22 21:52:20 -04:00
Fox-McCloud
77a354979c
tweaks
2015-10-22 01:13:37 -04:00
Fox-McCloud
a404929d16
Multiverse Sword
2015-10-21 23:59:59 -04:00
Fox-McCloud
34eadf298e
more 3 fixes
2015-10-12 22:28:25 -04:00
Fox-McCloud
27c420d87b
corrects a few del's
2015-10-08 21:22:20 -04:00
Fox-McCloud
e17c6bde22
Another del->qdel pass
2015-10-08 16:49:10 -04:00
Tigercat2000
8c97846746
-tg- style inventory update, stripping update
...
This commit does the following:
- Updates a few of our inventory procs to -tg-'s latest
- Nukes the equip_e system from orbit
- Fancy UI for stripping people now
- Nuked fucking kitten ears from their snowflakey bullshit update_icons
shitty fuck fuck FUCK
- NUKED FUCKING METAL DETECTORS AHHHHHHHHHHHHHHHHHHHHHHHHHH
2015-10-04 16:53:48 -07:00
Markolie
69c97863d5
Adminhelp update
2015-10-04 03:11:02 +02:00
TheDZD
de8e5ecfd0
Merge pull request #2254 from Markolie/swordnborg
...
Syndicate borg update, add medical syndicate borg, energy sword refactor
2015-10-02 15:49:57 -04:00
Markolie
f052512578
Fixes
2015-10-02 01:34:37 +02:00
Markolie
d18b18b5b4
Syndicate borg update, add medical syndicate borg, energy sword refactor
2015-10-01 04:21:24 +02:00
Fox McCloud
f000c0c225
Merge pull request #2238 from Markolie/emotes
...
Add cooldown to chirp emote, dsay fix
2015-09-29 22:37:31 -04:00
Markolie
1a7c565482
Fix
2015-09-30 03:38:44 +02:00
Markolie
9277a2f55e
Dsay fix
2015-09-30 03:35:30 +02:00
TheDZD
d84868d43f
Merge pull request #2229 from Markolie/hotkey
...
Admin PM fix
2015-09-29 20:25:56 -04:00
Markolie
f7c2685122
Admin PM fix
2015-09-30 00:21:55 +02:00
Fox-McCloud
933ffcd7d0
Merge pull request #2197 from Markolie/stickyban
...
Add in-game stickyban interface
2015-09-28 03:20:37 -04:00
Markolie
6b7d8914d9
Admin messaging for proc calls
2015-09-28 01:44:18 +02:00
Markolie
273bcb07e5
Add vial box to virology, in view() update
2015-09-28 01:18:04 +02:00
Markolie
44763a869a
Stickyban clean-up, add admin bans
2015-09-27 23:58:10 +02:00
Markolie
6f2a753d89
Send questions to admins and mods
2015-09-27 21:38:08 +02:00
Markolie
91eaf81a08
Fix
2015-09-27 03:18:05 +02:00
Markolie
6e19e36d9b
More admin logging
2015-09-27 03:07:06 +02:00
Markolie
4bd97b9943
Set default to world.view
2015-09-25 18:36:01 +02:00
Markolie
ce9545525c
Varedit right checks update
2015-09-25 18:33:51 +02:00
Markolie
24337913cd
Add SDQL, +PROCCALL, admin updates
2015-09-25 16:54:27 +02:00
Markolie
1a2459de0a
check_rights/R_MOD update
2015-09-24 04:35:04 +02:00
Markolie
d47c256cd7
Close spawn tag
2015-09-23 21:19:21 +02:00
Markolie
14f64b2b24
Fixes for Vox/Plasmamen highlanders/dodgeball players
2015-09-23 21:17:40 +02:00
Markolie
9adff714b9
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into sql
...
Conflicts:
code/controllers/configuration.dm
config/example/config.txt
2015-09-23 07:07:17 +02:00
Markolie
bec9fca533
SQL update
2015-09-23 06:13:42 +02:00
Markolie
551d4e8988
Admin jump window fix
2015-09-23 02:51:59 +02:00
Markolie
279c998ae8
OOC/LOOC update, stealthmin fixes
2015-09-17 21:27:24 +02:00
Markolie
90f722d752
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom
...
Conflicts:
code/modules/projectiles/guns/projectile/automatic.dm
icons/mob/back.dmi
2015-09-15 04:18:27 +02:00
Fox-McCloud
6fd7350746
Merge pull request #2040 from Markolie/guns
...
Guns update
2015-09-14 22:11:33 -04:00
Markolie
0c991f7092
Nuke code admin check fix
2015-09-14 22:13:18 +02:00
Markolie
f41f0a59fe
Guns update
2015-09-14 04:05:20 +02:00
Markolie
ca6c7d10ba
In hand sprite overhaul
2015-09-13 22:44:18 +02:00
Regen
5a87bfd41e
Move verb to debug
2015-09-09 16:52:35 +02:00