cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,046 Commits 8 Branches 0 Tags
eb679ea713b60fb2df10cdaa9f5dbc52da1386b3
Commit Graph

15760 Commits

Author SHA1 Message Date
PsiOmegaDelta
eb679ea713 Merge pull request #7134 from Segrain/dev 
Bugfix.
 2014-11-26 14:10:03 +01:00
PsiOmegaDelta
d2a5689d61 Merge pull request #7131 from GinjaNinja32/nullspace 
Fixes most nullspace items, rewrites floor tiles not to del() so much
 2014-11-26 14:09:36 +01:00
GinjaNinja32
a9111cc8e1 Fixes and guards against strange values 2014-11-25 20:01:30 +00:00
GinjaNinja32
c567bd93e9 Add defines, change comment 2014-11-25 19:44:36 +00:00
PsiOmegaDelta
a90dc80bb8 Merge pull request #7127 from Zuhayr/lathe 
Generalizing lathe recipes.
 2014-11-25 10:43:03 +01:00
PsiOmegaDelta
8af4c93694 Merge pull request #7124 from mwerezak/whisper 
Updates whispering messages
 2014-11-25 10:42:31 +01:00
PsiOmega
7386a881d7 Merge remote-tracking branch 'upstream/master' into dev 2014-11-25 10:33:47 +01:00
Segrain
6e3afeac5f Bugfix. 2014-11-25 10:29:39 +03:00
PsiOmegaDelta
d98bf2f84d Merge pull request #7121 from GinjaNinja32/monkey 
Fix for runtiming neaera cubes
 2014-11-25 06:44:11 +01:00
PsiOmegaDelta
1c10dc6a05 Merge pull request #7120 from mwerezak/init 
Cleans up monkey initialization
 2014-11-25 06:37:26 +01:00
PsiOmegaDelta
75993f2ef5 Merge pull request #7123 from DJSnapshot/adminfeatures 
fixes adminhelp to support mods as well
 2014-11-24 18:33:16 +01:00
GinjaNinja32
f8ea85b30e Typo fix 2014-11-24 17:29:48 +00:00
GinjaNinja32
48343a23fb Fix most nullspace items, rewrite floor tiles not to del() on every place/remove 2014-11-24 17:05:46 +00:00
Zuhayr
2b93a89d51 Generalizing lathe recipes. 2014-11-24 17:31:15 +10:30
mwerezak
7174cca74a Updates whispering messages 
Certain languages can specify a certain verb for whispering and the
message seen when someone whispers outside of hearing range now hints at
the language.
 2014-11-23 19:46:10 -05:00
DJSnapshot
b6463cf772 fixes adminhelp to support mods as well. 2014-11-23 16:17:26 -08:00
Zuhayr
a63ec86871 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-11-24 08:58:30 +10:30
GinjaNinja32
fbce3cba4b Fix neaera cubes, change monkeycube eat varfind method to not create nullspace monkeys 2014-11-23 18:57:42 +00:00
mwerezak
feaa27fff1 Cleans up monkey initialization 2014-11-23 13:44:59 -05:00
PsiOmegaDelta
7dd5da6793 Merge pull request #6896 from Hubblenaut/dev 
Context-based Combat Part 1
 2014-11-23 19:13:52 +01:00
PsiOmegaDelta
0ef913292f Merge pull request #7106 from Zuhayr/xenoflora 
Randomizes strange seed icons, fixes poppies.
 2014-11-23 18:10:00 +01:00
PsiOmegaDelta
c8e00f3e20 Merge pull request #7089 from sabiram/dev 
Moves my (sabirm)'s custom item to common loadout pool
 2014-11-23 18:08:16 +01:00
PsiOmega
dc5ab9bb64 Merge remote-tracking branch 'upstream/master' into dev 2014-11-23 12:07:45 +01:00
PsiOmegaDelta
8878b3e107 Merge pull request #7109 from Ccomp5950/mop_fix 
Solves a runtime when someone tries to mop up blood.
 2014-11-23 12:06:09 +01:00
PsiOmegaDelta
8e50a32ba8 Merge pull request #7103 from Segrain/dev 
Robotic appearances.
 2014-11-23 12:05:51 +01:00
PsiOmegaDelta
46a1a7c320 Merge pull request #7101 from MagmaRam/sprites 
Adds inhand sprites for the captain's tunic and jacket
 2014-11-23 12:05:45 +01:00
Zuhayr
f722d570fa Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-11-23 12:52:55 +10:30
Zuhayr
66c6c0f270 Amendment to the previous. 2014-11-23 10:15:31 +10:30
Zuhayr
5568ed15c1 Randomizes strange seed icons, fixes poppies. 2014-11-23 10:15:15 +10:30
PsiOmegaDelta
6db8680406 Merge pull request #7097 from GinjaNinja32/sensors 
Crew Monitoring Computer improvements, wallets working with computers
 2014-11-22 22:36:40 +01:00
Ccomp5950
674a76645f Merge pull request #7082 from PsiOmegaDelta/Science! 
Further Research Isolation Cell Changes
 2014-11-22 05:39:52 -05:00
PsiOmega
f3173bbbcf Merge remote-tracking branch 'upstream/dev' into Science! 2014-11-22 11:37:17 +01:00
PsiOmega
1784e62621 Merge remote-tracking branch 'upstream/dev' into Stripping 
Conflicts:
	code/modules/mob/living/carbon/human/whisper.dm
 2014-11-22 11:27:19 +01:00
PsiOmegaDelta
51386b6b45 Merge pull request #7102 from PsiOmegaDelta/AssignmentERT 
ERT and Xenobiology security HUD icons
 2014-11-22 11:18:09 +01:00
PsiOmegaDelta
d9aae79a32 Merge pull request #7008 from Zuhayr/spaceninjas 
Hardsuit/voidsuit change, ninja refactor.
 2014-11-22 09:30:54 +01:00
Ccomp5950
da3ad0a6db Merge pull request #7099 from Amunak/endgame-info 
Added round end summary (attempt 2)
 2014-11-22 03:28:38 -05:00
Ccomp5950
d0383883c2 Merge pull request #7094 from Neerti/borg_hud_port_2 
Semi-ports /tg/'s cyborg HUD, now with less merge conflict!
 2014-11-22 03:27:10 -05:00
Ccomp5950
93ac9115a5 Merge pull request #7093 from PsiOmegaDelta/Tracking 
AI can now track people with max level sensors.
 2014-11-22 03:25:59 -05:00
Ccomp5950
2b7170a6aa Merge pull request #7091 from mwerezak/gun-intents 
Adds intent-based firing control to guns, fixes targeting bug
 2014-11-22 03:25:12 -05:00
Ccomp5950
3ca02037ef Merge pull request #7088 from mwerezak/skrell 
Implements skrell changes for Searif
 2014-11-22 03:23:41 -05:00
Ccomp5950
efcf9a9d34 Merge pull request #7087 from mwerezak/master 
Fixes #7086
 2014-11-22 03:13:49 -05:00
ccomp5950
eb83d5ccec Solves a runtime when someone tries to mop up blood. 
proc name: afterattack (/obj/item/weapon/mop/afterattack)
  source file: mop.dm,45
runtime error: undefined proc or verb /obj/effect/decal/cleanable/blood/tracks/footprints/clean().
 2014-11-22 03:02:40 -05:00
Zuhayr
1c35f8825b Dummied out the AI movement code for a later project. 2014-11-22 08:04:06 +10:30
Zuhayr
05922375c5 Added the remaining missing icons (shitty codersprites, pls fix spriters) 2014-11-22 07:57:34 +10:30
Zuhayr
c8e8e663f9 Merge resolution. 2014-11-22 07:31:44 +10:30
PsiOmega
7182ff9c3f /tg/ input stripping. 
Borrows /tg/ html stripping code.
Ghosts are the first to be given this boon, they now have to deliberately emote things like "Spooky man and it#36&;s friends type crap".
 2014-11-21 18:32:51 +01:00
Segrain
078d6f74a5 Robotic flavour texts. 2014-11-21 19:32:40 +03:00
Segrain
7f199874fb Examining robomodules. 2014-11-21 19:28:46 +03:00
PsiOmega
71064574ed Merge remote-tracking branch 'upstream/dev' into AirAlarms 
Conflicts:
	code/game/machinery/alarm.dm
 2014-11-21 15:28:54 +01:00
PsiOmega
59aa4dfcc6 ERT and Xenobiology security HUD icons 
Treats ERT members as officially recognized Central Command personnel.
Adds missing Central Command secHUD icon. Adds a temporary icon for Xenobiologists.
 2014-11-21 14:46:54 +01:00